Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: pass custom ICE ufrag and pwd as local description init #1207

Merged
merged 2 commits into from
Jun 14, 2024
Merged

feat: pass custom ICE ufrag and pwd as local description init #1207

merged 2 commits into from
Jun 14, 2024

Conversation

achingbrain
Copy link
Contributor

Adds an optional second argument to rtc::PeerConnection::setLocalDescription that can contain an ICE ufrag and pwd that if passed will be used in place of the randomly generated versions.

Refs: #1166
Refs: #1201 (comment)

@achingbrain achingbrain force-pushed the feat/allow-overriding-ice-ufrag-and-pwd2 branch from 4b5ecb0 to ba4903f Compare June 11, 2024 08:58
@achingbrain
Copy link
Contributor Author

achingbrain commented Jun 11, 2024 •
edited
Loading

This is failing because although [email protected] was released after paullouisageneau/libjuice#243 was merged, it was tagged from a branch that does not have paullouisageneau/libjuice#243 in it:

libjuice % git log --graph
// snip
*   commit 52e9857a2110594f859cf5ec9c6f7637bf0c49e6
|\  Merge: 3a121cb 2de3524
| | Author: Paul-Louis Ageneau <[email protected]>
| | Date:   Tue May 14 11:14:33 2024 +0200
| | 
| |     Merge branch 'v1.4'
| | 
| * commit 2de35247f0b15fa385406f3e2020d0e3d4d5cfcc (tag: v1.4.2)    <----- release
| | Author: Paul-Louis Ageneau <[email protected]>
| | Date:   Tue May 14 11:11:09 2024 +0200
| | 
| |     Bumped version to 1.4.2
| |   
* |   commit 3a121cb157acda28c3735070af72f2e2f5f9651c   <----- not on the release branch
|\ \  Merge: 9d35168 237697f
| |/  Author: Paul-Louis Ageneau <[email protected]>
|/|   Date:   Tue May 14 11:03:56 2024 +0200
| |   
| |       Merge pull request #243 from xicilion/master
| |       
| |       Add support for setting ICE ufrag and pwd
| | 
// snip

@paullouisageneau could you release a new libjuice from the head of master to include paullouisageneau/libjuice#243 please?

@achingbrain achingbrain mentioned this pull request Jun 11, 2024
Closed
paullouisageneau
paullouisageneau reviewed Jun 11, 2024
View reviewed changes
Copy link
Owner

@paullouisageneau paullouisageneau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for adding the local description init parameter. I'll release libjuice 1.4.3 with paullouisageneau/libjuice#243.

src/peerconnection.cpp Outdated Show resolved Hide resolved
src/impl/icetransport.cpp Outdated Show resolved Hide resolved
include/rtc/peerconnection.hpp Outdated Show resolved Hide resolved
src/peerconnection.cpp Outdated Show resolved Hide resolved
@achingbrain
Copy link
Contributor Author

@paullouisageneau I switched the submodule here to use libjuice master to ensure CI passes, it looks good - I can switch it to 1.4.3 when you get a chance to release it.

This was referenced Jun 12, 2024
Draft
Draft
@paullouisageneau
Copy link
Owner

@achingbrain I released libjuice v1.5.0 which includes paullouisageneau/libjuice#243 and I updated the submodule on libdatachannel master.

@achingbrain @paullouisageneau
feat: pass custom ICE ufrag and pwd as local description init
264585c 
Adds an optional second argument to `rtc::PeerConnection::setLocalDescription`
that can contain an ICE ufrag and pwd that if passed will be used in place
of the randomly generated versions.

Refs: paullouisageneau#1166
Refs: paullouisageneau#1201 (comment)

Co-authored-by: Paul-Louis Ageneau <[email protected]>
@achingbrain achingbrain force-pushed the feat/allow-overriding-ice-ufrag-and-pwd2 branch from ad75e70 to 264585c Compare June 13, 2024 15:59
paullouisageneau
paullouisageneau approved these changes Jun 14, 2024
View reviewed changes
Copy link
Owner

@paullouisageneau paullouisageneau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good, thanks.

@paullouisageneau paullouisageneau merged commit 4261b4f into paullouisageneau:master Jun 14, 2024
12 checks passed
@achingbrain achingbrain deleted the feat/allow-overriding-ice-ufrag-and-pwd2 branch June 14, 2024 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paullouisageneau paullouisageneau paullouisageneau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@achingbrain @paullouisageneau